Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 3 Jun 2010 23:18:01 +0000 (23:18 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 3 Jun 2010 23:18:01 +0000 (23:18 +0000)

Trivial merge